home *** CD-ROM | disk | FTP | other *** search
/ Amiga Tools 3 / Amiga Tools 3.iso / grafik / raytracing / rayshade-4.0.6.3 / fixes / fix024 / libshade / yacc.y.diff < prev   
Encoding:
Text File  |  1994-08-09  |  13.3 KB  |  413 lines
  1. *** yacc.y    Mon Oct 11 14:59:56 1993
  2. --- yacc.y.frac    Mon Oct 11 14:46:03 1993
  3. ***************
  4. *** 43,49 ****
  5.   #include "libobj/sphere.h"
  6.   #include "libobj/torus.h"
  7.   #include "libobj/triangle.h"
  8. ! 
  9.   #include "liblight/point.h"
  10.   #include "liblight/infinite.h"
  11.   #include "liblight/spot.h"
  12. --- 43,52 ----
  13.   #include "libobj/sphere.h"
  14.   #include "libobj/torus.h"
  15.   #include "libobj/triangle.h"
  16. ! #include "libobj/ifs.h"
  17. ! #include "libobj/mountain.h"
  18. ! #include "libobj/fractalobject.h"
  19. ! #include "libobj/allocmatrix.h"
  20.   #include "liblight/point.h"
  21.   #include "liblight/infinite.h"
  22.   #include "liblight/spot.h"
  23. ***************
  24. *** 86,100 ****
  25. --- 89,114 ----
  26.   Atmosphere *CurEffect = (Atmosphere *)NULL;    /* Current atmos. effects */ 
  27.   PointList *Polypoints;                /* List of vertices */
  28.   MetaList *Metapoints, *Metapoint;
  29. + PointPool *Pointpool;
  30. + TrianglePool *Trianglepool;
  31. + EntityPool *Entitypool;
  32. + FractalEntity *CurrEntity;
  33. + FractalTriangle *CurrTriangle;
  34. + FractalPoint *CurrPoint;
  35. + int    count;
  36.   extern FILE *yyin;                /* input file pointer */
  37.   extern int yylineno;                /* Current line # in file */
  38.   extern Atmosphere *AtmosEffects;        /* atmospheric effects */
  39.   extern Medium TopMedium;            /* "air" */
  40. + static IfsOptions ifsOptions;                   /* options for IFS object */
  41. + static int ifsTransformRang;                    /* rang of IFS map */
  42.   extern void    GeomAddToDefined(),
  43.           LightAddToDefined(),
  44.           SurfaceAddToDefined();
  45.   extern Surface    *SurfaceGetNamed();
  46.   extern Geom     *GeomGetNamed();
  47. + int itemp;
  48. + 
  49.   %}
  50.   %union {
  51.       char *c;
  52. ***************
  53. *** 112,117 ****
  54. --- 126,139 ----
  55.       Trans *trans;
  56.       Expr *e;
  57.       SymtabEntry *sym;
  58. +     IfsTransList *translist;
  59. +         HeightValue   *heightvalues;
  60. +         StartGridStruct *startgrid;
  61. +         FractalClosure *fractalclosure;
  62. +         PointPool *Fpointpool;
  63. +         TrianglePool *Ftrianglepool;
  64. +         EntityPool *Fentitypool;
  65. +         TriangleList *Fentitytriangles;
  66.   }
  67.   %token <d> tFLOAT
  68.   %token <c> tSTRING tFILENAME
  69. ***************
  70. *** 132,137 ****
  71. --- 154,164 ----
  72.   %token tIMAGE tSMOOTH tCOMPONENT tTEXTSURF tRANGE tTILE tSTARTTIME tFRAMELENGTH
  73.   %token tNAME tFILTER tGAUSS tBODY tSAMPLE tEXTINCT tWINDY tMOUNT
  74.   %token tSHUTTER tFRAMES
  75. + %token tIFS tMINSIZE tMAXDEPTH tBOUNDING
  76. + %token tNORMALWEIGHTING tLOWPASS tHIGHPASS tCONSTANT 
  77. + %type <i> IfsNormalWeightingMethod
  78. + %token tMOUNTAIN
  79. + %token tFRACTALOBJECT tFPOINTS tFTRIANGLES tFENTITIES tENTITY
  80.   %type <c> Filename
  81.   %type <e> AnimExpr MExpr ParenExpr
  82.   %type <d> Expr Float
  83. ***************
  84. *** 152,158 ****
  85. --- 179,197 ----
  86.   %type <map> Mapping MapMethod OptMapping
  87.   %type <trans> TransformType
  88.   %type <sym> Symtabent
  89. + %type <obj> IfsCondensation IfsLeaves Ifs CIfs
  90. + %type <translist> IfsTransforms
  91. + %type <obj> Mountain
  92. + %type <obj> FractalObject
  93. + %type <heightvalues> HeightValues
  94. + %type <startgrid> StartGrid
  95. + %type <Fpointpool> FPointPool
  96. + %type <Ftrianglepool> FTrianglePool
  97. + %type <Fentitypool> FEntityPool
  98. + %type <Fentitytriangles> FEntityTriangles
  99. + %type <fractalclosure> FFractalClosure
  100.   
  101. + 
  102.   %left '+' '-'
  103.   %left '*' '/' '%'
  104.   %left UMINUS
  105. ***************
  106. *** 257,262 ****
  107. --- 296,305 ----
  108.           | Disc
  109.           | Torus
  110.           | Blob
  111. +         | Ifs
  112. +         | CIfs
  113. +                 | Mountain
  114. +                 | FractalObject
  115.           ;
  116.   NameObject    : tNAME tSTRING TransTextObj
  117.           {
  118. ***************
  119. *** 968,973 ****
  120. --- 1011,1181 ----
  121.               $$ = GeomHfCreate($2);
  122.           }
  123.           ;
  124. + Mountain        : tMOUNTAIN OptSurface Vec2d Vec2d Float Float Float Float Float StartGrid
  125. + 
  126. +                 {
  127. +                         $$ = GeomMountainCreate($3, $4, (int)$5, $6, (int)$7, (int)$8, $9, $10);
  128. +                         if ($$)
  129. +                             $$->surf = $2;
  130. +                 }
  131. +                 | tMOUNTAIN Vec2d Vec2d Float Float Float Float Float StartGrid
  132. +                 {
  133. +                         $$ = GeomMountainCreate($2, $3, (int)$4, $5, (int)$6, (int)$7, $8, $9);
  134. +                 }
  135. +                 ;
  136. + HeightValues    : HeightValues Float
  137. +                 {
  138. +                        $$ = (HeightValue *)Malloc(sizeof(HeightValue));
  139. +                        $$->Next  = $1;
  140. +                        $$->Value = $2;
  141. +                 }
  142. +                 | Float
  143. +                 {
  144. +                       $$ = (HeightValue *)Malloc(sizeof(HeightValue));
  145. +                       $$->Value = $1;
  146. +                       $$->Next  = NULL;
  147. +                 }
  148. +                 ;
  149. + StartGrid       : HeightValues
  150. +                 {
  151. +                        int    i,j,k;
  152. +                        HeightValue  *CurrHV, *CurrHV2;
  153. +                        for (i = 0, CurrHV = $1; CurrHV != NULL; CurrHV = CurrHV->Next, i++);
  154. +                        for (j = 1; j*j < i; j++);
  155. +                        if (j*j != i) RLerror(RL_ABORT, "Invalid number of startgridvalues: %d\n", i);
  156. +                        else {
  157. +                            $$ = (StartGridStruct *)share_malloc(sizeof(StartGridStruct));
  158. +                            if ($$) {
  159. +                                $$->Size = j-1;
  160. +                                CurrHV = $1;
  161. +                                $$->Data = AllocMatrix(Float, j, j);
  162. +                                for (i = 0; i < j; i++)
  163. +                                   for (k = 0; k < j; k++) {
  164. +                                         $$->Data[i][k] = CurrHV->Value;
  165. +                                         CurrHV2 = CurrHV;
  166. +                                         CurrHV = CurrHV->Next;
  167. +                                         free(CurrHV2);
  168. +                                   }
  169. +                            }
  170. +                        }
  171. +                 }
  172. +                 ;
  173. + 
  174. + FractalObject:  tFRACTALOBJECT OptSurface Float Float Float Float FFractalClosure
  175. +                 {
  176. +                    $$ = GeomFractalObjCreate((int)$3, $4, $5, $6, $7);
  177. +                    if ($$)
  178. +                        $$->surf = $2;
  179. +                 }
  180. +                 ;
  181. + FFractalClosure: FPointPool FTrianglePool FEntityPool
  182. +                 {
  183. +                     $$ = (FractalClosure *)share_malloc(sizeof(FractalClosure));
  184. +                     $$->Pointpool = $1;
  185. +                     $$->Trianglepool = $2;
  186. +                     $$->Entitypool = $3;
  187. +                 }
  188. +                 ;
  189. + FPointPool:  tFPOINTS 
  190. +              {
  191. +                 Pointpool = (PointPool *)share_malloc(sizeof(PointPool));
  192. +                 Pointpool->Points = (FractalPoint *)share_malloc(PointsToAllocate * sizeof(FractalPoint));
  193. +                 Pointpool->NumberOfPoints = 0;
  194. +                 Pointpool->PointsAllocated = PointsToAllocate;
  195. +              }
  196. +              FPoints
  197. +              {
  198. +                 $$ = Pointpool;
  199. +              }
  200. +              ;
  201. + FPoints:   FPoint
  202. +            {
  203. +            }
  204. +            | FPoint FPoints
  205. +            {
  206. +            }
  207. +            ;
  208. + FPoint:  Float Float Float
  209. +          {
  210. +              CheckPoints(Pointpool->Points, Pointpool->NumberOfPoints, Pointpool->PointsAllocated);
  211. +              CurrPoint = &Pointpool->Points[Pointpool->NumberOfPoints++];
  212. +              CurrPoint->x = $1;
  213. +              CurrPoint->y = $2;
  214. +              CurrPoint->z = $3;
  215. +          }
  216. +          ;
  217. + FTrianglePool:  tFTRIANGLES
  218. +              {
  219. +                 Trianglepool = (TrianglePool *)share_malloc(sizeof(TrianglePool));
  220. +                 Trianglepool->Triangles = (FractalTriangle *)share_malloc(TrianglesToAllocate * sizeof(FractalTriangle));
  221. +                 Trianglepool->NumberOfTriangles = 0;
  222. +                 Trianglepool->TrianglesAllocated = TrianglesToAllocate;
  223. +              }
  224. +              FTriangles
  225. +              {
  226. +                 $$ = Trianglepool;
  227. +              }
  228. +              ;
  229. + FTriangles: FTriangle
  230. +             {
  231. +             }
  232. +             | FTriangle FTriangles
  233. +             {
  234. +             }
  235. +             ;
  236. + FTriangle:  Float Float Float
  237. +             {
  238. +                 CheckTriangles(Trianglepool->Triangles, Trianglepool->NumberOfTriangles,
  239. +                                Trianglepool->TrianglesAllocated);
  240. +                 CurrTriangle = &Trianglepool->Triangles[Trianglepool->NumberOfTriangles++];
  241. +                 CurrTriangle->Point[0] = $1 - 1;
  242. +                 CurrTriangle->Point[1] = $2 - 1;
  243. +                 CurrTriangle->Point[2] = $3 - 1;
  244. +             }
  245. +             ;
  246. + FEntityPool:  tFENTITIES
  247. +              {
  248. +                 Entitypool = (EntityPool *)share_malloc(sizeof(EntityPool));
  249. +                 Entitypool->Entities = (FractalEntity *)share_malloc(EntitiesToAllocate * sizeof(FractalEntity));
  250. +                 Entitypool->NumberOfEntities = 0;
  251. +                 Entitypool->EntitiesAllocated = EntitiesToAllocate;
  252. +              } 
  253. +              FEntities
  254. +              {
  255. +                 $$ = Entitypool;
  256. +              } 
  257. +              ;
  258. + FEntities: FEntity
  259. +            {
  260. +            }
  261. +            | FEntity FEntities
  262. +            {
  263. +            }
  264. +            ;
  265. + FEntity:  tENTITY Float Float Float FEntityTriangles
  266. +           {
  267. +               CheckEntities(Entitypool->Entities, Entitypool->NumberOfEntities,
  268. +                                Entitypool->EntitiesAllocated);
  269. +               CurrEntity = &Entitypool->Entities[Entitypool->NumberOfEntities++];
  270. +               CurrEntity->XSize = $2;
  271. +               CurrEntity->YSize = $3;
  272. +               CurrEntity->ZSize = $4;
  273. +               CurrEntity->Triangles = $5;
  274. +           }
  275. +           ;
  276. + FEntityTriangles: Float
  277. +                   {
  278. +                       $$ = (TriangleList *)share_malloc(sizeof(TriangleList));
  279. +                       $$->TriangleNumber = $1 - 1;
  280. +                       $$->Next = NULL;
  281. +                   }
  282. +                   | FEntityTriangles Float
  283. +                   {
  284. +                       $$ = (TriangleList *)share_malloc(sizeof(TriangleList));
  285. +                       $$->TriangleNumber = $2 - 1;
  286. +                       $$->Next = $1;
  287. +                   }
  288. +                   ;
  289.   Poly        : tPOLY OptSurface Polypoints
  290.           {
  291.               $$ = GeomPolygonCreate(Polypoints, Npoints,
  292. ***************
  293. *** 1186,1191 ****
  294. --- 1394,1511 ----
  295.               Metapoint->next = Metapoints;
  296.               Metapoints = Metapoint;
  297.               Npoints++;
  298. +         }
  299. +         ;
  300. + Ifs        : IfsKey OptSurface IfsTransforms IfsOptions tEND
  301. +         {
  302. +             $$ = GeomIfsCreate($3, &ifsOptions);
  303. +             if ($$) 
  304. +                 $$->surf = $2;
  305. +         }
  306. +         ;
  307. + CIfs        : IfsKey OptSurface IfsCondensation IfsLeaves IfsTransforms IfsOptions tEND
  308. +         {
  309. +             $$ = GeomCIfsCreate($5, $3, $4, &ifsOptions);
  310. +             if ($$) 
  311. +                 $$->surf = $2;
  312. +         }
  313. +         ;
  314. + IfsKey          : tIFS  /* set option defaults */
  315. +                 {
  316. +                         ifsTransformRang = 1;
  317. +                         ifsOptions.depth = 99999999;
  318. +                         ifsOptions.size = 0.;
  319. +                         ifsOptions.normalweighting = HIGHPASS_NORMAL_WEIGHTING;
  320. +             ifsOptions.boxbounding = ifsOptions.spherebounding = FALSE;
  321. +             ifsOptions.listfilename = NULL;
  322. +                 }
  323. +                 ;
  324. + IfsCondensation    : TransTextObj ','
  325. +         {
  326. +             $$ = $1;
  327. +         }
  328. +         ;
  329. + IfsLeaves       : TransTextObj ',' /* Oppenheimer trees */
  330. +                 {
  331. +                         $$ = $1;
  332. +                 }
  333. +                 | /* no leaves -> a true IFS */
  334. +                 {
  335. +                         $$ = (Geom *)NULL;
  336. +                 }
  337. +                 ;
  338. + IfsTransforms    : OptIfsTransformRang IfsTransform
  339. +         {
  340. +             $$ = (IfsTransList *)Malloc(sizeof(IfsTransList));
  341. +             $$->trans = TransHead;
  342. +             $$->transtail = TransTail;
  343. +             $$->next = (IfsTransList *)NULL;
  344. +                         $$->rang = ifsTransformRang;
  345. +         }
  346. +         | IfsTransforms ',' OptIfsTransformRang IfsTransform
  347. +         {
  348. +             $$ = (IfsTransList *)Malloc(sizeof(IfsTransList));
  349. +             $$->trans = TransHead;
  350. +             $$->transtail = TransTail;
  351. +             $$->next = $1;
  352. +                         $$->rang = ifsTransformRang;
  353. +         }
  354. +         ;
  355. + IfsTransform    : TransformType
  356. +         {
  357. +             TransHead = TransTail = $1;
  358. +         }
  359. +         | IfsTransform PostTransform
  360. +         ;
  361. + OptIfsTransformRang : IExpr
  362. +                 {
  363. +                         ifsTransformRang = $1;
  364. +                 }
  365. +                 | /* no rang specified */
  366. +                 ;
  367. + IfsOptions      : /* no options */
  368. +                 | IfsOptions tMINSIZE Expr
  369. +                 {
  370. +                         ifsOptions.size = $3;
  371. +                 }
  372. +                 | IfsOptions tMAXDEPTH IExpr
  373. +                 {
  374. +                         ifsOptions.depth = $3;
  375. +                 }
  376. +                 | IfsOptions tNORMALWEIGHTING IfsNormalWeightingMethod
  377. +                 {
  378. +                         ifsOptions.normalweighting = $3;
  379. +         }
  380. +         | IfsOptions tBOUNDING IfsBoundingVolumeType
  381. +         {
  382. +         }
  383. +         | IfsOptions tLIST Filename
  384. +         {
  385. +             ifsOptions.listfilename = strsave($3);
  386. +         }
  387. +                 ;
  388. + IfsNormalWeightingMethod: tCONSTANT
  389. +                 {
  390. +                         $$ = CONSTANT_NORMAL_WEIGHTING;
  391. +                 }
  392. +                 | tLOWPASS
  393. +                 {
  394. +                         $$ = LOWPASS_NORMAL_WEIGHTING;
  395. +                 }
  396. +                 | tHIGHPASS
  397. +                 {
  398. +                         $$ = HIGHPASS_NORMAL_WEIGHTING;
  399. +                 }
  400. +                 ;
  401. + IfsBoundingVolumeType:    tBOX
  402. +         {
  403. +             ifsOptions.boxbounding = TRUE;
  404. +             ifsOptions.spherebounding = FALSE;
  405. +         }
  406. +         | tSPHERE
  407. +         {
  408. +             ifsOptions.boxbounding = FALSE;
  409. +             ifsOptions.spherebounding = TRUE;
  410.           }
  411.           ;
  412.   Outfile        : tOUTFILE Filename
  413.